edit code style, remove redurant screens