Cleaning up and fixing style issues