Cleanup code format slightly