Some much needed removal of repetitive drawing code