Makes changes suggested by review: single quotes and ternary operator implemented.