slight refactoring to fit code style

slightly refactored to fit code style of project