added transition decoration for completeness and little cleanup