Cleaned up some things...