Fixing formatting and removed some dead assignments