More cleanup, reformatting, annotations