Some code cosmetic enhancements

Changes using different options