Added trim, renamed a lot of classes\methods