Cleaned up shit