Symbols updated
#26 Refactoring code