Cleaning it up
Continuing port