comments and code clearification

changed some class and components names and added comments