Changed some code to make it more readable