Today
Code cleanup and reordering