Fixing code with respect to Coding Style