Removed a pointless operation
Refactoring to use matches
Tidy
Tidy
Tidy
Got rid of var finally
Tidy