cleaned up presentation/code