Orders and Return styles

Please see commit messages for detailed information.