Gt/cleanup style

This cleans up unused variables.

This also adds a `m_` prefix to member variables to reduce readability complexity.