started some basic code cleanup