Cleaned code, preparing to fork to test new class

Found a class online, preparing to fork in order to test the
implementation of it.