Cleaned up some structure and naming