Removed duplicate code. 

Also changed from return true to return false.