remove two unecessary methods and minor chagens in comments