cleaned layout, cleaned code