- better naming conventions - ish