Code cleanup & Dutch translations

Change-Id: I15cf94dc1d433c0ec607fb21a2a26c8f0f03ee76