Wraped some functions, removed some spaces