working through cleaning up source
committing this change for kate yo