cleaning up for readability