1.3- code clean up and improved port blocking