* Cleaned up some messy code left over