Fix indentation and stop using __ as a variable name