Cleans up code a little and changes default constants