Draft

Some clean