Just some basic code cleanup