Overall basic code cleanup.