remToPx and cleanup

@srohde let me know if anything looks out of sorts :) Tests are still passing :)