[FIX] Typos and some optimizations