(some) code cleanup