cosmetic
cosmetic and refactoring, fixes #2