Code cleanup, file separation.