more code cleanup & reduced lineWidth to 1px