Tweaking format and updates to python 3.3