Update

Cleaned things up a bit