conforming to coding standards, changes as per review