Added the decorator for BZ ID 1043830 and tried to resolve PEP8 issues