Looking better...although the cleanup is probably a bit premature