Just some code cleanup