Cleaned up various things