Implemented Joel's suggestions to clean up code. AnnotationSet.py still needs work.