more refactoring :rage1:
a bit more :rage1:
BEMing :rage1:
flexing a bit more :rage1:
polling :rage1: