Added minor comments / Made some private methods static