Cleanup for clarity & accuracy