formatting
mild reorganization, got rid of things