Cleanup

Code cleanup