I think there is no need of extra blank line here and some places down below