more tidyup and spliting functions in to more descriptive names
You'll thank me in 3 months time