Refactoring..again :)