delited unnecessary functions and comments - complited