Cleaned up my development code some.