 Can we edit the code to make it cleaner?