Code formatting
Massive housecleaning
Merge pull request #3 from archiloque/master

Massive housecleaning: make it look like actual ruby code