Formatting and Package Reference Fixes