Code cleanup

Code cleanup