Refactorizing! And added !whowrote