^ code clean up