Clean up syntax, conventions