Code clean up comments