fixing + code convention