Issue #1: Little refactoring