Cleaning this up just a little bit for readability