basic code clean up