Refactored away ::data
Some style fixes
Removed unneeded files