Killed some code duplication