variable clean up for readability