Updated core files to be more readable