More source code cleanup