Nice refactor ;D