Minor tidy up of code
Resolved plugin changed that lead to a conflict in the file