Cleaned up draw