3747 - Switching things to comply with Ruby Style guidelines