Helper API development and code cleanups