Cleanup and small adjustments