Resolve compilation errors
Tuning of formatted code