removed whitespaces for cleaner code

Auditors: pinoniq
Merge branch 'bugfixes'