Final code clean-up + build.