remove trailing whitespace
Fixed the build error
Modified according to new class structure
removed unnecessary includes
fixed build error and trying to test new functions using just single
call
class functions modified to remove build errors