Cleared code, fixed rst descriptions