fix placeholder
cleanup code