Working (?). Slight cleanup.