Stylistic changes and added comments