Code cleanup
Updates