Small update
Refactored for refactoring ;p