Some clean up and refactoring of the hough circle approach