More cleaning & codestyle