some code cleanup :shower: (not really)