Code cleanup, imports