Refactor - better layout, code style update.