Re-structured a bit