Clean up to add better readability