Format and fix stuff