Code Review (#5.2) and Documentation (#1.0)