fix & cleanup