refactor... no need to use classes every second