Feedback round + some cleanup