Fixed problems and updated specs as suggested by thomasjo
:lipstick: Code cleanup

Two cosmetic changes:
Substituted every ' with "
All function calls have been redacted so to avoid spaces between the parens and the arguments.