some simple code cleanup