code clean up, classes