bootstrap changes
plug better typehint 5.4
remove typehint to support 5.3
Merge pull request #603 from cordoval/cordoval-cleanup

bootstrap changes