Made code syntax changes based on Hound recommendations