Better indentation and syntax