Changed tabs to spaces and improved drawing