At least tried to improve code quality by a bit...