Added a new class period and separated format stuffs to another class