Variable, method calls cleanup
Variable cleanup