Clean up syntax & conventions