some fixes for code convention as per rubocop