some changes for ruby style guide compliance