Tidied circle selection code
Miscellaneous tidy ups