Cleanup Formating and Fix some Lint-Warnings
Merge