Restructuring for sanity