Fixed issues with original Code solution

Clean some spacing issues as well