Changed fields, const methods, formatting etc