rename methods to more semantic names + add file name on erro logs