Cleaning up and more clearly assigning default values at the top