Re-organized things to be more consisten.