Fixed most checkstyle issues

Change-Id: I58f1d749bde6bba2b90e7ea153060255ee86e3fd
Signed-off-by: Alexander Wert <alexander.wert@sap.com>
Merge pull request #24 from AlexanderWert/master

Fixed most checkstyle issues