Fix Style and remove unrelevant info