Added some stylistic changes for readability