Further tidying and improving of source