code cleanup stuff