Code cleanup/