cleanup: removed some outcommented parts and fixed code to fulfill coding standards
cleanup: removed some outcommented parts and fixed code to fulfill coding standards

clickalicious/DoozR,clickalicious/DoozR,clickalicious/DoozR