Reformat code

Also updated sourceCompability to 1.6

![selfie-0](http://i.imgur.com/GLu1tHR.png)