Cleaned up some more..