perfectionist cleanups