Getting up to date
Cleaned up some code.