right. I also feel duplication of the code. 
OK. remove them.