Altered add-annotation bit and reformatted code more.