Update

Cleaned up code
update