Commented and unexported//removed unnecessary functions and methods.