Last code clean up