Reindent.
Remove unneeded variable.
Merge pull request #439 from XhmikosR/develop

Remove unneeded variable + reindent