removed repeating code from Widget