Reorganized file slightly