Updated language, formatting

Nothing fancy here, just some cleaning