Moved typedef after class declarations
Changed constant naming style
Replaced size_t with int