.. more code cleanup ..