Some style changes and stuff
Resolving merge conflict