Cleanup and small changes