Some clean up in localiton/ files
Big sort in style/

- Dash!
Merge pull request #53 from upisfree/master

Big sort in style/, some clean up in localiton/ files