Little cleanup, no dynamic vars