fix overindentation and variable naming