Some formatting and cleanup