Changes done as per ruby style guide