Some commenting & code cleanup