cleanup code, split large files