consistency
fixed naming
working on reference