Cleaned up more bits
