[#21] Fixed elvis comments.