Replaced the static methods in Rashi classes and added comments