Removed useless function and slight edit in struct