removed superfluos code and whitespace fixes
merged and solved conflicts