Refactor ordering; add some style