Cleaned up subfragment