Fixed more indent and variables