cleanup for readability