more editing/formatting