Final review and cleanup