revised code - now clean from styles