Cleaned up from various things