Improved documentation and removed redundant funcs