Code cleanup
pass