Some Code-Style refactoring