Reorganizing and reviewing code