Fixed some spacing and unused extension