cleaned up; locking/privacy