Cleaned up adding appropriate equality methods

Signed-off-by: Ippoippo <ippoippo_software@ippoippo.net>