Add comments and normalize methods' names