Apply suggestions from BevapDin