cleaned up code set