Adding budget functionality, additional cleanup.