gorgeous code cleanup