Commenting functions

Commenting functions, removing unnecessary features