Made some improvements :pencil: