Cosmetic changes (trailing spaces removed, needed @Override added, ...)