refinements to make cleaner and more concise