Clean up formatting, organization