Little bit code cleanup