Removed redundant function, updated some comments