Changed files and normalized properly