Comments cleanups and functions added