Started code clean up