Slight refactor, changed single quotes to double quotes for all strings and names
A bit more refactoring