Removed of some dead stores and fixed some styling