Fix indentation issues and unnecessary assignment