Replace self return type with static return type of implementations

Replace self return type with static return type of implementations #22