Updated files with clean formatting