Refactor and remove some trash