implemented toString method + little cleanup