cleaned up more code in helpers and service