Addition of staticmethod decorator and some formatting prittification