Removed duplicates, consistent naming, added whitespace