Hand converted to actual sketch resolution; code cleanup