Fixed code to match code convention