bad practices re: commiting + massive refactor