Herten
Source cleanup
Code cleanup (mostly missing Override annotations)