Update v2.80C

Fixed last update, codestyle cleanup