cleaned up helpers
cleaned up more code in helpers and service
clean up code