Code review, correctly formatted this time