commit before code refactor

getting too messy