Code cleanup
Code review updates