Formatting + API clean ups