split files and cosmetic changes