some cleanup, split files