Add Init function and cleaned up some naming conventions