cleaned up somewhat
cleaned up somewhat