Did a little bit of cleaning up, DRY as much.