Shortened the code