More style changes & removing unused parts