Continuing to move functions our of init() func

- moving functions out of init() function