More house cleaning before actual code/design starts.