Cleaning up initalization