Cleanup Code + Update Port