Updated codestyle to be more conventional