cleaned up things some more