Refactor Low Hanging Fruit