Code clean up #2
Description
Clean up code. Please use this thread to identify overall points of cleanup or spawn off into a new issue if it is focused and actionable.
{{ message }}
Clean up code. Please use this thread to identify overall points of cleanup or spawn off into a new issue if it is focused and actionable.