cleaned up some public members and integer types