Remove unnecessary vars, add prose