Cleaned up init.