Remove some redundancy and simplify changes made on last commit