Fixes as per ruby-style-guide and indentations