Cleaned up more stuff