Changes:
--------
- Fixed some typos and minor code beatifying.

Signed-off-by: Markus Lidel <Markus.Lidel@shadowconnect.com>