commented/cleanup code