Refactoring2

No need to call something *Struc when it is a struct.