afroholic's code cleanup