Cleaned up code and added initializers/defaults