Fixed some issues due to coding conventions