define selected class
bugfix
cleanup