Cleaned up various bits