first code clean up