Add since, remove unnecessary comments, and clean up spacing