Changed some conventions and cleaned up before core engine code comes in