Clean up syntax and naming