Improved code style. Fixed guard on cloud9 IDE