More cleanup and commenting