Cleaning up struct implementation