Moar simplification!
Beautification.
Revert "Beautification."

This reverts commit 542f212d97a345830e925ea09d0371999755fec0.
Merge branch 'develop'