Converted classes to abc's and made more pep-8