cleanup code a bit
categorize forks properly