Cleaned up to match style guidelines.