v1.1, code cleanup