Small code cleaning/refactoring