Cleaned up more things