Cleanup

Add comments and TODO