Formatting fixes / Flexibility enhancements