code styling & removed unnecesary includes