Cleaned up init