better naming.
more cleanups.