Cleaned up some minor stuff