fixed coding conventions violations