refactoring
updated doc blocks
delete unused property