Made some slight improvements