Some stuff cleaned up