Removed unused include & minor stylistic changes