Added annotation UI and reformatted code using PyCharm 2.7's new PEP8 integration.