extra colon fix & cleanup