Refactoring: Modern Syntax.
Removed some newlines.
Enforce brackets for if statements.
Unified to guard statements into one.
Bugfix for #628 - "Exception after Arrange -> Bring To Front".
Merge pull request #1062 from NickyWeber/bugfix/#628_bring_to_front_exception

Bugfix/#628 bring to front exception