I think using the constructor to set properties would make this code simpler too.