Fixes and adjust formatting