Clean up for readability and semantics