change class to be a bit more simple