Cleanup
Major code cleanup