Add annotation and clean up whitespace