FIX: Typos and style details