Clean up drawing

See title