code tidied up, start clustering now