Start of code clean up