Cleanup, add comparison fuctions into ComparableVersion
Fixed comparison TODOs