Cleaned up more