Minior code cleanup