Cleaned up, minor changes