Fix space characters and review code