Rename class
added comments