thorium_ prefix and more indent issues fixed