Cleanup. Added comments.