Wee bit of testing
Streamlining code