Review: Code cleanup and minor changes