align the code base again