Following convetions

Better following of conventions