Add some comments and cleanup