closed #4 - Alignment issue + refactoring