Add style and semantics

While keeping the hacker style.