Refactoring

only two small suggestions.