basic code cleanup