Cleanup, and added a revision number