Some quick style corrections taken care of
Using %w is easier than literal strings