Remove puts and whitespace fix