Cleaned up the initializers