Simplified class instantiation + Updated Tests and Readme + Minor changes