Added Consistencies like adding ""s, and reordering code