Code cleanup
Comments cleanup