Bit more modularized