Removed some lines, tidied up drawing.