Additional code cleanup/organization