+ Updated formatting
+ Bug fixes