cleaning up, now passing JSHint