Some more tidying
Tidying
Commented functions correctly