Changed some things for better readability