Removed comments, simplified a line