remove unused variables + indentation fixes