Cleanup source, + fix formatting derp in data manager class,