Cleanup day #3

Code cleanup day