Refactoring again, make it cleaner...