Solve build errors
Format code