Please comment any improvements I could make