Follow up on review; removed repetitive functions