Cleanup
Code cleanup again