Little bit of code cleanup