Some Cleaning & Formatting

NOTE: There ist still some cleaning and formatting left