Better indentation and adding AGParameterAssert