implementing code style suggestions