Cleanup syntax for readability