refactoring to adhere to code conventions