cleaned up...sort of