Fix style issue; add asserts