Cleaned up some stuff...