cleaned up comments and extra api code-age