Fixed coding style, added more extension types, fixed @return annotations