Other small fixes and code refactoring #devhub
close