Code clean up, ui clean up.