Slight refactor (removing comments)