removed string parsing logic to seperate class
updated comments