GA + some cleaning