minor refactors (cleaning up code)
minor refactors (cleaning up code)