Formatting
Bugfixes, Refactorings, Optimizations, etc.
Improved rspec suite