Neatend code + comments