Clean up, uniform syntax