Fixed up indentation and annotations