Updated packages
Cleaned up some code...