Code cleanup. No functionalty added or removed