Cleanup, moving things into init function