Added license and fixed methods naming