+ Code improvements