modified sysout messages
removed classes