Refactor and minor pixel pushing.