remove white spaces + some typos