Cleaned up various things!