Addressed Ryan's comments of reuseable code