minor syntax change and removed unused class