Cleaning up a little, still need more work to finish port