Complete code overhaul

- Updated object literal
- Cleaner layout
- Easier to read code
.
Merge remote-tracking branch 'origin/master'